Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 8 Jun 2010 13:59:22 +0000 (13:59 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 8 Jun 2010 13:59:22 +0000 (13:59 +0000)

Trivial merge